Merge branch 'master' into 'matthiasc/for-master'
authorMatthias Clasen <mclasen@redhat.com>
Thu, 1 Oct 2020 13:56:37 +0000 (13:56 +0000)
committerMatthias Clasen <mclasen@redhat.com>
Thu, 1 Oct 2020 13:56:37 +0000 (13:56 +0000)
# Conflicts:
#   .gitlab-ci/test-msys2.sh


Trivial merge